projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a337063) | patch
* lisp/net/rcirc.el (rcirc-server-alist, rcirc, rcirc-connect): Resolve
authorStefan Monnier <monnier@iro.umontreal.ca>
Thu, 10 Jun 2010 01:10:04 +0000 (21:10 -0400)
committerStefan Monnier <monnier@iro.umontreal.ca>
Thu, 10 Jun 2010 01:10:04 +0000 (21:10 -0400)
commitef44863df420c91d291aaf2d16c1c282211b4eea
treec90c8ccbe4bea45540f0adfa1c3ef51e5dde5b17tree | snapshot
parenta337063d4da1e8bef95e5ae124c9994617253efccommit | diff
* lisp/net/rcirc.el (rcirc-server-alist, rcirc, rcirc-connect): Resolve
merge conflict, giving preference to the emacs-23 version of the code.
lisp/ChangeLog diff | blob | history
lisp/net/rcirc.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.